merge trunk
authorKenichi Handa <handa@m17n.org>
Sat, 19 May 2012 11:47:40 +0000 (20:47 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 19 May 2012 11:47:40 +0000 (20:47 +0900)

Trivial merge